summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/charmap.s14
-rw-r--r--asm/crt0.s14
-rw-r--r--asm/dma3_manager.s20
-rw-r--r--asm/emerald.s31652
-rw-r--r--asm/gpu_bg.s208
-rw-r--r--asm/gpu_obj.s396
-rw-r--r--asm/libagbbackup.s56
-rw-r--r--asm/libagbsyscall.s50
-rw-r--r--asm/libgcc.s160
-rw-r--r--asm/libgcnmultiboot.s136
-rw-r--r--asm/libmks4agb.s226
-rw-r--r--asm/librfu.s302
-rw-r--r--asm/librtc.s64
-rw-r--r--asm/macros.s24
-rw-r--r--asm/macros/event.s356
-rw-r--r--asm/macros/pokemon_data.s12
-rw-r--r--asm/macros/window.s4
-rw-r--r--asm/main.s102
-rw-r--r--asm/main_menu.s212
-rw-r--r--asm/malloc.s48
-rw-r--r--asm/multiboot.s36
-rw-r--r--asm/pixel_buffer.s20
-rw-r--r--asm/rtc.s104
-rw-r--r--asm/string_util.s176
-rw-r--r--asm/task.s44
-rw-r--r--asm/text_renderer.s208
-rw-r--r--asm/tileset_animation.s170
-rw-r--r--asm/window.s116
28 files changed, 17465 insertions, 17465 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 00:41:31 +0000